Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ELASTIC_APM_CLOUD_PROVIDER default value #1494

Closed
wants to merge 8 commits into from

Conversation

yang-wei
Copy link
Contributor

@yang-wei yang-wei commented Jul 20, 2023

if i understand correctly the default value is "auto"
https://github.com/elastic/apm-agent-go/blob/main/utils.go#L179

bmorelli25 and others added 8 commits January 18, 2023 17:02
(cherry picked from commit fb87682)

Co-authored-by: Gil Raphaelli <gil@elastic.co>
* module/apmotel: update to stable metrics API (elastic#1448)

* module/apmotel: update to stable metrics API

* module/apmotel: go mod download

* Allow retrieving span created in agent from otel, and store agent span in context when creating it with otel (elastic#1450)

* store the agent transaction and span into the context

* add wrapper so we can retrieve agent span from otel

* fix precheck

* Require Go 1.19+ (elastic#1453)

* Require Go 1.19

Update docs to drop the "best effort" support for
unsupported Go versions, and only test with the
two most recent Go releases. Also, simplify the
"check-modules" and "update-modules" make targets.

* Remove extraneous "go:build" tags

* README: update supported Go versions (elastic#1463)

* Update https://github.com/stretchr/testify v1.8.4 (elastic#1464)

* [doc] Align agents logs documentation (elastic#1465)

* align logs docs

* fix typo

* add missing reference

* build(deps): bump github.com/gin-gonic/gin in /module/apmgin (elastic#1451)

Bumps [github.com/gin-gonic/gin](https://github.com/gin-gonic/gin) from 1.7.7 to 1.9.1.
- [Release notes](https://github.com/gin-gonic/gin/releases)
- [Changelog](https://github.com/gin-gonic/gin/blob/master/CHANGELOG.md)
- [Commits](gin-gonic/gin@v1.7.7...v1.9.1)

---
updated-dependencies:
- dependency-name: github.com/gin-gonic/gin
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update golang.org/x/... to latest (elastic#1466)

* Update golang.org/x/sys to latest

* Update golang.org/x/*

* Update go-fastjson

* build(deps): bump mellium.im/sasl in /module/apmgopgv10 (elastic#1467)

Bumps mellium.im/sasl from 0.2.1 to 0.3.1.

---
updated-dependencies:
- dependency-name: mellium.im/sasl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump github.com/prometheus/client_golang (elastic#1468)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.7.0 to 1.11.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.7.0...v1.11.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump mellium.im/sasl from 0.2.1 to 0.3.1 in /module/apmgopg (elastic#1373)

Bumps mellium.im/sasl from 0.2.1 to 0.3.1.

---
updated-dependencies:
- dependency-name: mellium.im/sasl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: use latest Go release for microbenchmarks (elastic#1469)

* Fix data race accessing Request.URL (elastic#1472)

If an HTTP client is instrumented with apmhttp,
then the http.Request.URL is recorded for including
in span context. The caller of the HTTP client request
may mutate the URL after the response is ready, so we
must clone the URL while recording it to prevent data
races.

* Prepare v2.4.3 (elastic#1473)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Damien Mathieu <42@dmathieu.com>
Co-authored-by: Silvia Mitter <silvia.mitter@elastic.co>
Co-authored-by: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* docs: update doc with go support policy

* docs: remove go.mod comment

the doc doesn't actually mention specific versions
@yang-wei yang-wei changed the title Update ELASTIC_APM_CLOUD_PROVIDER default Update ELASTIC_APM_CLOUD_PROVIDER default value Jul 20, 2023
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please retarget this to main? We make all changes on main, and then merge back to 2.x on release.

@yang-wei yang-wei changed the base branch from 2.x to main July 20, 2023 05:10
@yang-wei yang-wei requested a review from a team as a code owner July 20, 2023 05:10
@axw
Copy link
Member

axw commented Jul 20, 2023

Ah this probably needs to be recreated, there's a bunch of commits that we won't want in there.

@yang-wei yang-wei closed this Jul 20, 2023
@yang-wei
Copy link
Contributor Author

🙏 #1495

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants